tests/kola: Two test fixes

Now that we're actually running this in CI.

diff --git a/tests/kola/destructive/itest-label-selinux.sh b/tests/kola/destructive/itest-label-selinux.sh
index 87fb26f0a0645aca3295fb8ea7be178b241e1bf1..7bfd23517512be001b3e5c3354b06235563f635e 100755 (executable)
--- a/tests/kola/destructive/itest-label-selinux.sh
+++ b/tests/kola/destructive/itest-label-selinux.sh
@@ -5,6 +5,7 @@
 set -xeuo pipefail
 
 . ${KOLA_EXT_DATA}/libinsttest.sh
+require_writable_sysroot
 
 date
 cd /ostree/repo/tmp

diff --git a/tests/kola/destructive/staged-deploy.sh b/tests/kola/destructive/staged-deploy.sh
index 47d7c9af89e65ba431ed50c3d6b6013c6220cb60..e0c17a27b36118df03198aeaaf0f333ac6a2a1d5 100755 (executable)
--- a/tests/kola/destructive/staged-deploy.sh
+++ b/tests/kola/destructive/staged-deploy.sh
@@ -71,6 +71,8 @@ case "${n}" in
     firstdeploycommit=$(rpm-ostree status |grep 'Commit:' |head -1|sed -e 's,^ *Commit: *,,')
     assert_streq "${firstdeploycommit}" "${newcommit}"
     # Cleanup
+    ## TODO remove workaround for https://github.com/coreos/rpm-ostree/pull/2021
+    mkdir -p /var/lib/rpm-ostree/history
     rpm-ostree cleanup -rp
     echo "ok upgrade with staging"